merge
authorIan Campbell <ian.campbell@xensource.com>
Wed, 23 Aug 2006 17:39:17 +0000 (18:39 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Wed, 23 Aug 2006 17:39:17 +0000 (18:39 +0100)

Trivial merge